Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle docker-compose v2, free up more space #3809

Merged
merged 22 commits into from
Aug 6, 2024

Conversation

bobcallaway
Copy link
Member

new GH runner image only has docker compose and our rules for deleting packages to make free space need updated.

Copy link

codecov bot commented Aug 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.65%. Comparing base (2ef6022) to head (5f28568).
Report is 175 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3809      +/-   ##
==========================================
- Coverage   40.10%   37.65%   -2.45%     
==========================================
  Files         155      202      +47     
  Lines       10044    12579    +2535     
==========================================
+ Hits         4028     4737     +709     
- Misses       5530     7256    +1726     
- Partials      486      586     +100     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
hectorj2f
hectorj2f previously approved these changes Aug 4, 2024
@hectorj2f hectorj2f enabled auto-merge (squash) August 4, 2024 21:45
@haydentherapper
Copy link
Contributor

Tests still failing due to running out of space.

Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Copy link

@MMONSTER124 MMONSTER124 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

991287761

Signed-off-by: Bob Callaway <[email protected]>
@bobcallaway
Copy link
Member Author

@steiza my last commit seems to have fixed the docker-compose issue, let me see if i can finish the space issue

Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
Signed-off-by: Bob Callaway <[email protected]>
@hectorj2f hectorj2f merged commit 7e3c2f5 into sigstore:main Aug 6, 2024
22 checks passed
Comment on lines +67 to +71
if [ "$repo" == "fulcio" ]; then
yq -i e '.networks={"default":{ "name":"fulcio_default","external":true }}' docker-compose.yml
yq -i e '.services.fulcio-server.networks=["default"]' docker-compose.yml
tail docker-compose.yml
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI I think all this is unnecessary if you change line 27 to use label com.docker.compose.network=default

echo "setting up OIDC provider"
pushd ./test/fakeoidc
oidcimg=$(ko build main.go --local)
docker network ls | grep fulcio_default || docker network create fulcio_default
docker network ls | grep fulcio_default || docker network create fulcio_default --label "com.docker.compose.network=fulcio_default"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

com.docker.compose.network=default

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants